Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 5 May 2010 23:05:35 +0000 (23:05 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 5 May 2010 23:05:35 +0000 (23:05 +0000)

Trivial merge